auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 09:11:27 +0000 (10:11 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 22 Dec 2012 09:11:27 +0000 (10:11 +0100)

Trivial merge